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