Merge "Reset keyguard translation when transition is cancelled" into main