Merge "Fix NPE in ActionBarAdapter"