Merge "Put widget view updating logic in setListener" into tm-qpr-dev