Merge "Removed extraneous comment delimiter from the getDefaultFocusHighlightEnabled method." into tm-dev