Merge "Fix bug where app list says "No app" in multi-window mode"