Merge "Keyguard - Don't recreate KeyguardPresentation" into sc-dev