Merge "Constrain Non-DeviceConfig settings reset times & unify DeviceConfig reset mode"