Merge "Add aconfig flag for NotifLiveDataStore refactor" into main