Merge "Modify system settings: incorrect UI state"