Merge "Wait in ReorderWidgets test for the workapce to load after changing it." into tm-qpr-dev