Merge "Add support for battery/screen state changes."