Merge "Fix graphical glitches on keyguard-unlock with PIP" into udc-dev