Merge "Reorder widgets no longer overlaps when no space is available" into tm-qpr-dev