Merge "Small optimization for the battery status screen"