Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev