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

Change-Id: Icc53397d4fac48ebb819cee03b2dd445b1de67f9