Merge "Always apply config updates." into mnc-dr-dev