Merge "Update icon for battery saver conditon." into pi-dev