Merge "Include additional error log around widget removal" into tm-qpr-dev