Merge "Fix race condition in TileServices" into qt-dev