Merge "Show up to 8 icons before eliding; fix animations" into pi-dev
am: a914cf0aff

Change-Id: I78ce6fa456b801f2c2d7b2f9ed57b33b5f34188c