Merge "Notification icons on AOD status bar"