am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread

Merge commit '14854820eac895a925791fb41ccd330447fd4f02'

* commit '14854820eac895a925791fb41ccd330447fd4f02':
  Add a configuration option to turn on the screen when you unplug the device.