Fix screenshot instrumentation tests on API 29+

Merged Torsten Grote requested to merge screenshots-api29 into master

Merge request reports