Merge "[flexiglass] Wipe dialog + more refactoring of Auth/Bouncer code." into main