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