Merge "Use real InputWindowInfo for traces and dumps"