Merge "Refactor ViewScreenshotTestRule slightly to make it a bit extensible" into udc-dev