Merge "Add opt-out properties for aspect ratio settings" into udc-qpr-dev