Merge "[bc25] Fix clipped notifications in the shade, and align to the right." into main