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

Change-Id: Ide6fa8ee3e1a58c4ce473026b2d3db4a5877f100