Merge "Revert "Allow transitioning through lifecycle when finished""