Bug 989717 - Handle enabling and disabling state properly. r=vchang, a=1.3t+