Merge "Fix bug #12907897 Some Developer Options are not disabled when putting Developer Options to "OFF""