Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev