Merge "Bold the battery saver '+' icon" into pi-dev