Merge "Add quickpickup sensor to config.xml" into sc-dev