Merge "Adding a debug setting to enable visual indicator for GL"