Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev