Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev