Merge "Bug 1203: Reset state of LocationDispatchCodecs"