Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
am: c4321c7e6c  -s ours

* commit 'c4321c7e6caa1a3699567f9c39d2bc33bbf39c6b':
  [DO NOT MERGE] Modify system settings: incorrect UI state