Merge "Update 'more options' button when changing the printer." into nyc-dev