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

Change-Id: I66bd2deb1243f093c4a57e3c44f3be4818392908