Merge "Separate GraphicsEnv from libui"