Merge "Fix build file such that CarSystemUi can be easily extended" into qt-qpr1-dev