Merge "Add padding for cancel and Don't allow button" into main