Merge "SF: Update the trunk-stable bugid for 24Q1 multidisplay feature" into main