Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev