Merge "Remove the current battery usage chart and replace it with new one" into sc-dev