Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev