Merge "Fix Toast exception in NotificationManagerService" into oc-dev