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

Change-Id: I28c1abc4eea843fdbffc95d9bccde910e415a468