Merge "Encode vault params in key sync task"