Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev