Merge "GFX api cleanup 1.5 of 2" into jb-dev