Merge "Ensure end action is called if keyguard animation is cancelled" into sc-qpr1-dev