Merge "Use view order when iterating icons in a slot" into pi-dev
am: 29d9832db7

Change-Id: If6aab2493d002ec762541845ff26fd089a0f0cd4