Bug 1103957 - Avoid automatically re-entering a phase we are trying to end, r=terrence