Merge branch 'topic/hdmi-jack' into for-next