Merge "Allow modifying ActivityOptions in ActivityInterceptorCallback"