Merge "Pre-cache more system servers" into pi-dev