Merge "Cache aconfig flag for NAH refactoring" into main