Merge branch 'ib-extcon-4.12' into HEAD