Merge "Remove extra padding between Notification header and inline_controls"