Merge "SCREENSHOT_DETECTION -> teamfood" into tm-qpr-dev