Merge "UI cleanup for Customization Lock screen" into udc-dev