Merge "Support additional keyguard transitions" into udc-dev