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

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