[automerger skipped] Merge "Avoid using secondary displays as launch params...
[automerger skipped] Merge "Avoid using secondary displays as launch params when not support" into qt-qpr1-dev am: 22331640
am: d3efe68d -s ours
am skip reason: change_id If17f119008cb2fa9ab08090f128c83215f8523a0 with SHA1 740448f0 is in history
Change-Id: Id8b1d21f93f68f876b0726d08f3ef6a4f2d52562