Merge "Move car alert dialog layouts" into rvc-dev