Merge "Force Software Rendering for KeyguardClockFrame" into udc-dev