Merge "Simplify/fix testThreeButtonsTaskbarBoundsAfterConfigChangeDuringIme" into main