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

* commit 'f934025e9d6ae6c1225a470ea213d23fe6ca8338':

Change-Id: I654c910421005e89221761bbd8c8d2cef68841db