Merge "Fix media being stretched during the wake-up/unlock animation" into udc-dev