Merge "Avoid using secondary displays as launch params when not support" into...
Merge "Avoid using secondary displays as launch params when not support" into qt-dev am: c5568f9a am: a4cd2edc
am: 5960fb0e
Change-Id: I1d02d44a9cdc6450ab1b038a82e575e94a53d0b2