Merge "Pass transition token to finish() for Keyguard" into udc-dev