Merge "Show mobile icons with left-to-right in order of slot index" am: 3d9482fb7d am: 227e7f0488
am: 737e4febe5

Change-Id: I2da810b57e240b4948fe85a13750a3ab4041c4f4