Merge "Battery saver color changes" into pi-dev