Merge "Only allow mediaserver to report video battery stats" into qt-qpr1-dev