Merge "Flake fix : Wait setting applied before returning from setConfig"