Merge "Making ReorderWidget test more reliable" into tm-qpr-dev