Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 am: 1be0abe801" into rvc-qpr-dev-plus-aosp