Merge "Maintain previews aspect ratio" into udc-dev