Merge "Dark Theme doesnt forget car changes" into rvc-dev am: 88973641 am: 4c39009c am: d202f504 Change-Id: I03e64b8aafacc500ef8d64c82a6fd504ecec527f