Merge "Remove keyguard state from onAnimationCancelled" into udc-dev