Merge "Remove streams from system_server" into pi-dev