Merge "Make notif control padding match" into sc-dev