Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev