Merge "Cleanup GraphicsEnv::setAngleInfo()" into main