Merge "Ensure system shortcut icons always appear in correct order" into ub-launcher3-dorval
am: 50ba921aa8

Change-Id: Ie296f30e81bea966e1cfc88b81b33cbc1b5bf6e0