Merge \"Calling start/stop listening in onStart/onStop\" into ub-launcher3-calgary
am: 2ee27b12e9

Change-Id: I5daac4e467351909d1f091d76d8eb8e2079ad986