Improvements to SettingsArray and its tests

Change-Id: Icc39b332a399ec09b3f35cead319d9be1595aeee
Merge "Improvements to SettingsArray and its tests"