Merge "Action bar height and font size added to device default for car"