Merge "Skip animation if there are no targets" into sc-v2-dev