Merge "Add missing conditional in settings provider" into mnc-dev