Merge "reset battery stats when media player service is started" into lmp-dev