Merge "Fix an issue with concurrent modification on widget holders list" into tm-qpr-dev