Merge branch 'topic/hdmi' into for-next