Merge "Avoid using secondary displays as launch params when not support" into qt-dev am: c5568f9aac
am: 54ce005a97

Change-Id: I8c6af618546f5bb8ec1eadb7a9988a71857bb88a