Merge "Add null check for package in setEnabledSetting"