Merge "Fixing issue with IME not showing after PiP menu is shown."