Merge changes from topic "am-9dd9c9d7fba44b49afffe53e9f0a56a2"

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-qpr-dev am: fec4943a -s ours am: 6c3388db -s ours am: 898ea306 -s ours am: c3e202e5 -s ours am: 2fabff2d -s ours am: 1f93cdf8 -s ours am: e022b1db -s ours am: 284ea651 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am: 3c2723ff -s ours am: 23cceaa3 -s ours am: 6c38efc2 -s ours am: 2e685151 -s ours am: cd94996a -s ours am: a087c92e -s ours am: a7d145a7 -s ours am: e88e45fe -s ours