Merge "Removing the list of formats from the javadoc in setSurroundFormatEnabled" into sc-dev