Merge "Don't attempt to create context menu for 'add printer' entry"