Merge "Remove IntentResolverInterceptor" into tm-dev