Merge "Clear calling identity when enabling WebView fallback logic." into nyc-dev