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

Change-Id: I52ceae9f0f74dd7e86436e5505b180756954818b