Merge "stagefright: unblock stop if already in error state"