Merge "Add a flag to control Keyguard-started transitions." into main