Merge "Using DiffUtil for calculating widget diff instead of a custom implementation" into tm-qpr-dev