Merge "Stop using NotificationContentInflater directly when the interface will work" into main