Merge "Simplify ContentPreviewCoordinator (pure refactor)" into tm-qpr-dev