Merge "Report video battery on/off from mediaserver"