Merge "Update look and feel of multi-select preference screen." into pi-car-dev