Merge "Fix ReOpenImeWindowTest flicker test for shell transitions" into sc-v2-dev