Fix issue #2097060: Screen all messed up when setup wizard finished

The new code to rebuild the window list was missing some app tokens.
Also there were a few other smaller bugs floating around.

Change-Id: I7734917af0b76ee4aa304e6a5321401d87640f89
1 file changed