Merge "Move gfx samples to test directory for compatibility testing." into jb-dev