Merge "Fix PanelSlicesAdapterTest" into main