Merge "Match current colors for device default car theme"