Merge "Specify display by Port in display-layout-config" into main