Merge "[Bouncer] Hide status icons in bouncer." into tm-dev