Merge "Do not disable the add printer icon and have special empty view if no print services are enabled"