Merge change 27177 into eclair

* changes:
  Add auto-brightness mode to the list of backed-up settings