Merge "Revert "Reorder widgets no longer overlaps when no space is avai..."" into tm-qpr-dev