Merge "Fix race condition in QSTileHost" into tm-qpr-dev