Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev