Merge "Revert "add support for areNotificationsEnabled"" into nyc-dev