Issue fixes for Android Tab & DesktopWeb