Merge changes from topic "FK_168687572" into sc-qpr1-dev

* changes:
  Improve restore of QS_AUTO_ADDED_TILES
  Fix support for USER_ALL in FakeSettings