Merge "Dummy graphics controller for test suite" into devel/graphics