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

Change-Id: I223e5a408a464dfdd5d52cbd3c3537d8845f04e1