Merge "Attempt to fix testShowImeCold flake"