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

Change-Id: I2d511256f15f91b1e22fae41bf992d40b9cbbf74