Merge "Limit modal windows to only hide windows in the same task." into nyc-dev