Merge "Avoid using secondary displays as launch params when not support"