Merge "Remove ImeFlickerTests button tap dependency" into main