Merge "Add unit tests to ActivityStarterInterceptor"