Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev