Merge "Overriding styles from the support lib." into pi-car-dev