Merge "Fix setServerParams to not always set snapshot pending" into pi-dev