Merge "[automerger skipped] Merge "Avoid keyguard fling transition interrupt for timing issue" into main am: 2a4e99a798 am: 842d94060f -s ours" into main