Merge "Fix tiles animating when QS edit is open" into nyc-dev
am: d1ed81e

* commit 'd1ed81e5afcc5772011e066322319bec4f06add0':
  Fix tiles animating when QS edit is open

Change-Id: Iff54427f468e9dccb9cb672d2bd67e00762a736d