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

Change-Id: Id2036d35540a5d2498f7484e3d7ac30804f9d2e3