Merge "Fix status bar battery meter."