Merge "Refactor content recording out of DisplayContent" into tm-dev