Merge "Enable redaction interstitial after setting up pattern" into oc-dev