Merge "[flexiglass] User input on bouncer stops face authentication." into main