Merge "Prevent double keyguardGoingAway, and finish cancelled animations." into sc-v2-dev