Merge "Change image attachment test to use a public resource ID" into tm-qpr-dev