This breaks non-single-client mode? (though likely the HTML button for that should be commented out for now since the flow on Android doesnt even exist yet, but...early alpha, whatever)