Merge "Don't cache IME surface in fullscreen mode" into sc-dev