Merge "msm: 8974: add MHL device discovery flag"