Merge "The big Keyguard transition refactor (7/n)"