Merge "Use view order when iterating icons in a slot" into pi-dev