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

Change-Id: I3d23246f897eebd00e443477167468d7dce0b216