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

Change-Id: I6a94eaf5cf301c955f11ca6cf07681cd47d30060