Merge "More precise status bar battery icons." into gingerbread