Merge "Report video battery on/off from mediaserver" into qt-qpr1-dev