Merge "Avoid keyguard fling transition interrupt for timing issue" into main