Merge "Only allow mediaserver to report video battery stats"