Merge "Revert "Change graphics common version to 6"" into main