Merge "Remove Add menu item now that we have a FAB"