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

Change-Id: Ibd0b93eda8f0f6859a58c5cc7de15f47654bb202