Merge "Add toolbar to preference fragments" into pi-car-dev