Merge "Revert "Cache aconfig flag for NAH refactoring"" into main