Merge "Notification icon size"