Merge "Fix double call to ScreenshotController" into tm-qpr-dev