Merge "Fix NPE in Toolbar"