Merge "FM: Convert notifications to use NotificationChannel"