Merge changes I1cbdff1d,I23906b4c

* changes:
  Handle headsethook voice launching
  Add 5s timeout to wakelock