Merge changes from topic 'am-751050fb-7a27-4f0e-a322-43480086c901' into ub-launcher3-master

* changes:
  Revert "Update existing Folder items' ranks to match their pre-permutation layouts." am: 36be1d3674 am: 9c40ee1b1c
  Revert "Update existing Folder items' ranks to match their pre-permutation layouts." am: 36be1d3674
  Revert "Update existing Folder items' ranks to match their pre-permutation layouts."