Merge "Add debug property to enable/disable ANGLE"