Merge "Fix ReorderWidgets by removing faulty 4x4 cases" into tm-qpr-dev