Merge "Move battery icon back to bottom of the screen"