Merge "Report video battery on/off from mediaserver" into qt-qpr1-dev
am: 57eeeb0031

Change-Id: I72316cc05a0302095ad623f96a6a6d8aad9e968e