Merge "Allow the avatar shape to be configured" into pi-car-dev