Merge "Rename NotificationInflater to NotificationContentInflater"