Merge "Add rounded corners for system dialog for car"