Merge "Fix ActivityStartInterceptor tests" into pi-dev