Merge "Adding fallback transition for animating in/out of affiliate groups." into lmp-dev