Merge "Fix frozen notifications after bouncer dismissal" into tm-dev