Merge "Refactor Battery Chart View State Controll"