Merge changes I50af022a,I82b77ec1 into qt-dev

* changes:
  Do not vibrate if last acquire message was NOT_DETECTED
  Persist dialog state across configuration change