Merge "Revert "Update existing Folder items' ranks to match their pre-permutation layouts."" into ub-launcher3-dorval-polish