Merge "Add correct columns configuration for split shade on tablets" into main