Merge "Update notification layouts to match redlines" into lmp-dev