Merge "Fix double-detach DualTimer bug" into oc-dev