Merge "Fix settings flakiness bug" into main