Merge "Must synchronize for ...Locked() code paths" into qt-dev