Merge "Revert "Cleanup IME window visibility flag logic"" into udc-qpr-dev