Merge "Allow initial toolbar state to be set in XML" into pi-car-dev