Merge "Disable Preferences save button before setting change"