Merge "Notification layout fixes:" into sc-dev