Merge "Fix Battery usage page refresh issue"