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