Merge "add support for areNotificationsEnabled" into nyc-dev