merging guest display fixes with style branch

Merge branch 'guest-waiting-connect-display-fix' into stylistic_madness