Pretty much there.
Final (pass 1) fixes:

Rearrange OSD activation and preparation to avoid possible timing
issues.  Force user to add passwords (so Ubuntu does not get confused).