Merge "[DO NOT MERGE] Refactor ViewScreenshotTestRule slightly to make it a bit extensible" into tm-qpr-dev