Merge "Adding test for the Widgets reordering." into tm-qpr-dev