Merge changes I2f42d5a3,I99c99292 into mnc-dev

* changes:
  Rename ActiveNotification to ActiveNotifications
  Rename 'AutomaticBackup' to 'AutoBackupForApps'