Merge "Make the battery icon more obvious when in powersave mode"