Merge "Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: ebdc01a8f3" into rvc-d1-dev-plus-aosp