Merge "Refinements to the notification icon area."