Merge "Add a dimen for notification expand button icon padding." into main