Merge "Adding additional javadocs for setSurroundFormatEnabled" into sc-dev