Merge "Refactor a few renderer RPCs"