Merge "[bc25] Remove support for bottom-aligned shade." into main