Merge "Explicitly depend on privapp config" into qt-dev