Merge "Support showing app usage list for two battery charts"