Merge "Correct AllApps horizontal padding" into udc-qpr-dev