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