Merge "Reset slider animator on density change" into nyc-dev
am: d52a81eeae

* commit 'd52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
  Reset slider animator on density change

Change-Id: Ice27584a57b9bc22c85acb77564612c06906db37