Merge "Make removeImeSurfaceFromWindow to one-way" into sc-dev