Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev