Merge "Handle non-image URIs and quick copies" into tm-dev