Merge "Refactor image handling" into pi-car-dev