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

* commit 'f934025e9d6ae6c1225a470ea213d23fe6ca8338':
  Fix signal cluster animation leak

Change-Id: I65fb75615d940da492beda522ee675f8d783c813