Merge "Don't set value when developer options disabled"