Merge "Calling start/stop listening in onStart/onStop" into ub-launcher3-calgary