Merge "[bc25] Fix notifications not being rendered on Dual Shade." into main