Reimplement state picker (desktop only). #1120.