Merge "Lock screen ui clean up" into udc-dev