Merge "Correctly disposing of LauncherUnlockAnimationController" into udc-dev