Merge "Reorder home settings Bug: 62957388" into ub-launcher3-dorval-polish