Merge "Avoid using secondary displays as launch params when not support" into...
Merge "Avoid using secondary displays as launch params when not support" into qt-dev am: c5568f9a am: a4cd2edc am: 5960fb0e
am: a814f7a7
Change-Id: I2d511256f15f91b1e22fae41bf992d40b9cbbf74