Merge "Fix flaky passengerShowImeNotAffectDriver()" into main