Merge "Revert "Report video battery on/off from mediaserver""