Merge branch 'display-patch' into libresoc-partsig