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