Fix some issues with eating notifications and starting
when not in use.

Change-Id: Ic8f25edf842e8e36db176ce82e3d93cae6d4b6d8