Merge "Rename GraphicsTypes.h to GraphicTypes.h" into pi-dev