Merge "Move add-printer list headers to the right positions." into nyc-dev