Merge "Fix IME flicker test in split screen when no layer change was applied" into main