Merge "Update error UI" into pi-car-dev