Merge "update battery stats for video/audio" into lmp-dev