Merge "Refresh battery status icons" into pi-dev
am: 64379a08f7

Change-Id: Ief175d64ec2dad05d188ed9aa12cfaf0b74c4758