Merge "Various fixes to fix CarServiceTest crash" into qt-dev