Merge "[multi-shade] Remove shade content padding when the shade is collapsed." into udc-dev