Merge "Fix flaky notifyPowerBoostNotifiesTouchEvent test" into main