Merge "Remove battery usage column icon (1/2)" into sc-dev