Merge "GlobalScreenshot - Fix race condition" into qt-dev
am: 0ebf0252e0

Change-Id: Idd450a77f83c91b50e706b17ef3fb123c000a779