Merge "Deleting DisplayContent#reparentDisplayContent and related code" into sc-dev