Merge "Fix QS edit overanimating" into nyc-dev
am: 90a225d

* commit '90a225d46d5f674b144fb3942623797b0b537871':
  Fix QS edit overanimating

Change-Id: I43d3d7d0010fe0eaf4b7d76b7cc0537ef28f9441