Merge "Check for setting to already set" into mnc-dev