xda-one: fix toolbar not being present and cleanup