Merge "Deferred widget update" into tm-qpr-dev