Merge "Add transition on keyguard showing" into main