Merge "Fix signal cluster animation leak" into nyc-dev am: 8891ae1f7f
am: 5943328825

* commit '5943328825d500aaea4c712b2e6fee0e840860a9':
  Fix signal cluster animation leak

Change-Id: Ib8e54c8d49ddf62f8814a9ef7ef371adcdc27d94