Merge "Revert "Calling start/stop listening in onStart/onStop"" into ub-launcher3-calgary
am: f8a2ba2707

* commit 'f8a2ba27078badc61b7122a6781214a4148a686f':
  Revert "Calling start/stop listening in onStart/onStop"

Change-Id: I79a543a0fd1c0724b652c2e04545d95db7429eec