Merge "Add new ProximitySensor wrapper that automatically uses appropriate sensor." into qt-qpr1-dev