Merge "Set Gutter on both sides by default" into pi-car-dev