Merge "Disable multidisplay in shelf UI" into 24D1-dev