Merge "Apply user aspect ratio override settings" into udc-qpr-dev