Merge "Allow custom toolbar menu on ToolbarFragment" into ub-launcher3-master