Merge "Headless: fix locking work profile with separate challenge on power button" into udc-dev