Merge "Restrict reflection access to INotificationManager from Toast"