Merge "Move graphics APIs to the light grey." into pi-dev