Merge "Issue 5247986: Battery drain due to audio wakelock"