Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev