Merge "Fix keyboard staying up in AOSP launcher." into main