Merge "Add synchroniztaion to prevent concurrent modification exception" into qt-qpr1-dev