Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev