Merge "Don't play transitions if keyguard didn't register" into udc-qpr-dev