Merge "Don't go to NORMAL after task launches if animation in progress" into sc-dev