Merge "Remove DisplayContent#positionDisplayAt()"