Merge "Restore shelf clip logic from R to prevent clipping on collapse." into sc-dev