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

Change-Id: I3f38b451d7d605357f3d2186461fcca475f5d2fd