Merge "Remove app widget view when widget id is deleted" into tm-qpr-dev