Merge "Add tests for shouldAnimate and onDoneButtonClicked" into sc-dev