Merge "Using a more generic Launcher method name in KeyguardUnlockAnimationController" into main