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

Change-Id: I2e85e3a20e133f8990c08561fd9c2e0c4330467e