Merge changes Ie4b018d9,I790ea567

* changes:
  Disable resolving while intercepting based on a flag
  Adding ActivityInterceptorCallbackRegistry