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