Merge "Fix the battery usage screen left alignment issue" into sc-dev