Merge "Update battery saver colors to make them more obvious" into pi-dev