Enable action bar the right way instead of catching NPE

Change-Id: I52ecaca62f997b2522212f87ec713e5731e962b4