Fix battery info dialog's layout
Merge branch 'battery_info_dialog'