Thanks for the reply. Actually the issue has been handled internally in our SDK so the issue you have mentioned in this thread will not longer exist and you do not need to do any extra implementation. I tried to follow the steps you have mentioned above to reproduce this issue with our latest demo app(Under custom UI mode), and this issue no longer appears.
Let me know if you have any questions. Thanks!