Improved singleton init methods. Fixed a NPE in TomahawkMainActivity#updateDrawer in the process