Merge changes from topic 'HideMultiUser' into oc-dr1-dev

* changes:
  Don't show multi-user in QS unless it has been activated before
  QS: Move auto-add state to settings provider