Merge "Fix signal cluster animation leak" into nyc-dev