Merge "Reset bouncer instead of just hiding it"