Merge "Return to correct home stack task in multi-window mode" into nyc-dev