Merge "Update ANGLE Developer Options"