Merge "Revert "Remove activity from task if not set properly.""