Merge "Do not use hidden enabledSetting"