Also move section break holder into the wrapper class. Change-Id: I949e81af180f11514aff558615cfeda44cb96a3c