Merge "Made usages of animate().setListener() call safer" into sc-v2-dev