Merge "Add padding to dialog" into udc-qpr-dev