Merge "Use @EnableFlags and @DisableFlags annotations instead of soon-to-be deprecated methods." into main