Merge "Change the API to check if a surround format is enabled"