Merge "Fix pip surface properties during keyguard exit" into udc-dev