Merge "Migrate settings UI to use async security check" into mnc-dev