Merge "Make changes to Settings Spa tests compatible with RNG." into main