Merge "Remove clipping and stabilize lock preview screen" into udc-dev