Merge "Don't expand notifications when bouncer visible" into main