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

Change-Id: I8f4928ece334704d1df1e825bf9a2c4f3d10b69f