Merge "Fix starting animator on detached view"