Merge "Add padding to compose headings" into ub-gmail-ur14-dev