Merge "Avoid using secondary displays as launch params when not support" into qt-qpr1-dev