Merge "Adds apex available for security export aconfig flag" into main