Merge "Fix animations for app QS tiles." into nyc-mr2-dev
am: eb3623c7dd

Change-Id: Ifcc88360b7e059ce0dd9f40ea2d9107e36e3bb5a