Merge commit 'fa3414a7d313fd1f4bc80cf2fd42fbdb33908197' * commit 'fa3414a7d313fd1f4bc80cf2fd42fbdb33908197': Don't show battery info when unplugging (fixes bug 2128323).