Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev