Merge "Add transition on keyguard showing" into 24D1-dev