Merge "QS: Tweak animation paths when few icons" into nyc-mr1-dev
am: c1aac02a37

Change-Id: I83acd8ac5778d2879dd71d459a1b7288fa0b898b