Merge "Move load battery consumer icon and label into the background" into sc-dev