Merge "Store initial bouncer showing state." into tm-dev