Register and deregister the bus properly

This prevents random IllegalStateExceptions that happen.

Change-Id: I69ce99c3ebaa212b6261f58c3463f0c7c1df4280