Merge "Revert "Compare aconfig flag value in SetttingsState and new storage"" into main