Merge "Align the top of the largeIcon with the top of the expander when expanded." into sc-dev