Merge "Fixing flakyness in widget tests" into tm-qpr-dev