mhl_v2: Merge Samsung Changes