Merge "Refresh battery status icons" into pi-dev