Merge "Add edittext preferences and support for CarSettings" into pi-car-dev