Merge "Avoid wrapping the display change leash to Keyguard unlock animation" into udc-dev