Merge "Clean up MessagingLayout notifications" into sc-dev